Tighten test suite for Windows; sync it to UNIX one more closely.

diff --git a/gpsbabel/mingw/testo b/gpsbabel/mingw/testo
index e494f3279d25ff5d6c4abed017b4643064d677bc..cce08aa19b60dd0de7805259bdc236272522a840 100755 (executable)
--- a/gpsbabel/mingw/testo
+++ b/gpsbabel/mingw/testo
@@ -1,56 +1,5 @@
-PNAME="wine -- ./gpsbabel"
+export PNAME="wine -- mingw/gpsbabel"
 
-# Geocaching .loc
-rm -f /tmp/gl.loc
-${PNAME} -i geo -f geocaching.loc -o geo -F /tmp/gl.loc
-diff /tmp/gl.loc ../reference
-
-# GPSUtil
-rm -f /tmp/gu.wpt
-${PNAME} -i geo -f geocaching.loc -o gpsutil -F /tmp/gu.wpt
-diff /tmp/gu.wpt ../reference
-
-# GPSman 
-rm -f /tmp/gm.gm /tmp/gm.gm+
-${PNAME} -i geo -f geocaching.loc -o gpsman -F /tmp/gm.gm
-${PNAME} -i gpsman -f /tmp/gm.gm -o gpsutil -F /tmp/gm.gm+
-diff /tmp/gm.gm+ /tmp/gu.wpt
-
-# GPX
-rm -f /tmp/gl.gpx /tmp/gpx.gpx
-${PNAME} -i geo -f geocaching.loc -o gpx -F /tmp/gl.gpx
-${PNAME} -i gpx -f /tmp/gl.gpx -o gpsutil -F /tmp/gpx.gpx
-diff /tmp/gpx.gpx /tmp/gu.wpt
-
-# Magellan Mapsend
-rm -f /tmp/mm.mapsend /tmp/mm.gps
-${PNAME} -i geo -f geocaching.loc -o mapsend -F /tmp/mm.mapsend
-${PNAME} -i mapsend -f /tmp/mm.mapsend -o gpsutil -F /tmp/mm.gps
-diff /tmp/mm.gps /tmp/gu.wpt
-
-# Garmin Mapsource
-rm -f /tmp/mm.mapsource /tmp/ms.gps
-#${PNAME} -i geo -f geocaching.loc -o mapsource -F /tmp/mm.mapsource
-#${PNAME} -i mapsource -f /tmp/mm.mapsource -o gpsutil -F /tmp/ms.gps
-# diff /tmp/ms.gps /tmp/gu.wpt
-
-# Magellan serial
-# TODO
-
-
-# CSV (Comma separated value) data.
-
-#${PNAME} -i geo -f geocaching.loc -o csv -F /tmp/csv.csv
-#${PNAME} -i csv -f /tmp/csv.csv -o gpsutil -F /tmp/csv2.csv
-#diff /tmp/csv2.csv /tmp/gu.wpt
-
-# PCX (Garmin mapsource import) file format
-rm -f /tmp/mm.pcx /tmp/pcx.gps
-${PNAME} -i geo -f geocaching.loc -o pcx -F /tmp/mm.pcx
-${PNAME} -i pcx -f /tmp/mm.pcx -o gpsutil -F /tmp/pcx.gps
-diff /tmp/mm.gps /tmp/gu.wpt
-
-# Magellan file format
-${PNAME} -i magellan -f ../reference/magfile -o magellan -F /tmp/magfile
-diff /tmp/magfile ../reference/magfile
+cd ..
+exec ./testo
 

diff --git a/gpsbabel/testo b/gpsbabel/testo
index c0f481029efcf3e3744f4073e42a934af3d4adec..083a170f7046b66e3a1409ee6050683b96caf3f4 100755 (executable)
--- a/gpsbabel/testo
+++ b/gpsbabel/testo
@@ -1,5 +1,4 @@
-
-PNAME=./gpsbabel
+PNAME=${PNAME:-./gpsbabel}
 TMPDIR=/tmp/gpsbabel.$$
 mkdir -p $TMPDIR
 trap "rm -fr $TMPDIR" 0 1 2 3 15